Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Resources Page #47

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Added Resources Page #47

wants to merge 6 commits into from

Conversation

atishaye
Copy link

@atishaye atishaye commented Oct 16, 2021

For Issue: #27

Fixes:

Additions:

  • Resources link to the navbar in index.html
  • resources.html
  • css folder which contains two CSS files
  • Three images in the img folder

Checklist

  • Ensured there is an open issue for your PR
  • Added comments to additions
  • Followed common formatting conventions for the contribution language
  • Tested code to ensure original features are working

Select one:

  • Ensured you are the contributer assigned to the Issue for this PR
  • Commented for ownership of an OPEN issue where no one is assigned or has yet asked to be assigned

Screenshots

…Also, updated the index.html to add the resources link to the navbar at the top of the website
@atishaye atishaye marked this pull request as draft October 19, 2021 15:46
@atishaye atishaye marked this pull request as ready for review October 19, 2021 15:49
@atishaye
Copy link
Author

@S3cBar0n, @thatrobotdev

Kindly review this PR

Due to the other PRs being merged first, I already had to resolve merge conflicts twice.

@thatrobotdev
Copy link
Contributor

Sorry about the repeated merge conflicts, I'll take a look at this ASAP! Unfortunately I don't have more time to review PRs tonight, but I'll try to resolve any merge conflicts that prevent it from being merged so that you don't have to deal with the burden of updating your code change :D

Thank you so much for your contribution, I'm excited to take a look!

@thatrobotdev thatrobotdev self-requested a review October 21, 2021 07:24
@thatrobotdev thatrobotdev linked an issue Oct 21, 2021 that may be closed by this pull request
5 tasks
@atishaye
Copy link
Author

Sorry about the repeated merge conflicts, I'll take a look at this ASAP! Unfortunately I don't have more time to review PRs tonight, but I'll try to resolve any merge conflicts that prevent it from being merged so that you don't have to deal with the burden of updating your code change :D

Thank you so much for your contribution, I'm excited to take a look!

No worries. Take your time :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Advertise the "Hack Club Toolbox" in a new "Resources Page"
3 participants